auto merge of #543 : alexcrichton/cargo/doc-fixes, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 9 Sep 2014 22:58:50 +0000 (22:58 +0000)
committerbors <bors@rust-lang.org>
Tue, 9 Sep 2014 22:58:50 +0000 (22:58 +0000)

Trivial merge